Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 4 May 2011 06:13:23 +0000 (23:13 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 4 May 2011 06:13:23 +0000 (23:13 -0700)
commit6ec79aedbc69063937bcb2323481396b9fde4fc6
tree83f7d057c6504f7f4af21e797d262b6356f6b56a
parent8fba48e9bc48c0b20953cfb32059751e20899157
parentbbba04bdda0621a8c605bd2612b3d4205dc999db
Merge from mainline.
src/ChangeLog